From 140a63234e18c874d59c59f6aa9d72836875f4b4 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Sat, 1 Sep 2001 04:14:25 +0000 Subject: [PATCH] pass in user data. Fri Aug 31 20:01:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 9 +++++++-- gtk/gtktreeview.h | 3 ++- 9 files changed, 51 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ecf5313b2a..3e246ab818 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Aug 31 20:01:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data. + + * gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data. + Wed Aug 29 20:40:58 2001 Owen Taylor * gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 150c166bc7..dfbdf3e2ad 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1031,6 +1031,11 @@ gtk_tree_view_destroy (GtkObject *object) gtk_tree_view_search_dialog_destroy (search_dialog, tree_view); + if (tree_view->priv->search_user_data) + { + (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data); + tree_view->priv->search_user_data = NULL; + } if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -8902,7 +8907,7 @@ gtk_tree_view_search_iter (GtkTreeModel *model, GtkTreeViewColumn *column = gtk_tree_view_get_column (tree_view, tree_view->priv->search_column); - if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter)) + if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data)) { (*count)++; @@ -8937,7 +8942,7 @@ gtk_tree_view_search_iter (GtkTreeModel *model, while (gtk_tree_model_iter_next (model, iter)) { - if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter)) + if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data)) { (*count)++; if (*count == n) diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index d748ccf4a1..2c10f253c9 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -119,7 +119,8 @@ typedef gboolean (* GtkTreeViewDroppableFunc) (GtkTreeView *tree_vi typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel *model, gint column, gchar *key, - GtkTreeIter *iter); + GtkTreeIter *iter, + gpointer search_data); /* Creators */ -- 2.30.2